Minor code and javadoc cleanup.