Checkstyle changes; indent changes; equals/hash changes and other misc cleanup.