Merge "Clean up NullCheck generation and record stats about it."