Sorry, took a bit longer to find some time, but I've created a pull-request with the proposed fix.

On a sidenote: the IntelliJ code style XML doesn't quite seem to match the coding guidelines. One thing I found is it did not add whitespace after method call parentheses, resulting in validation errors while building.