Fixing Javadoc issues initially identified by North in efe53d9d02716cc215456e2794a43011759322d9, but without relying on replacing fully-qualified names with imports because that's our coding standard.