Avoid http://bugs.java.com/bugdatabase/view_bug.do?bug_id=7122142
Minor fixes: reindent