Merge "FindBugs didn't like setInternalField, and neither do I."