* checkstyle doesn't accept a newline before "as" (error is SpacingBeforeAs)
* more closing brace fixes.  this time for sure?