More work on struct code gen for Java