Minor API cleanups. Javadoc.