Minor javadoc improvements and fixes for @Deprecated methods.