Heewon Lee

@aherbert Just pushed the suggested changes; PTAL.

Fixed the checkstyle issue for the moment, in case it might be of help. I don't consider myself wholly qualified for conducting the transition you mentioned, but it sounds good...

@garydgregory Sorry for the trouble. I clearly wasn't thinking straight when I made this PR. I think I corrected the test case with this commit.

@garydgregory Done! PTAL