WYRL: fixes for the new java file writer.