Small fixes

This is a set of smaller changes in support of the ongoing refactoring of java-loxi.

Reviewer: @rlane