Merge mani's checkstyle changes.