A couple of checkstyle-related commits