Checkstyle tweaks.