More benign javadoc and import cleanup [1055]