Changed: Method annotations and javadoc tweaks.