What problem does this code solve?
Fixes remaining SonarQube issues in JSONObject. Also addresses some missed action items from the previous review.

Does the code still compile with Java6?
Yes

Risks
Low

Changes to the API?
No

Will this require a new release?
No

Should the documentation be updated?
No

Does it break the unit tests?
No

Was any code refactored in this commit?
Yes, this was all refactoring

Review status
APPROVED

Starting 3-day comment window