Fix javadoc field references.
Drop unnecessary declaration specifiers.
Allow less restrictive predicates; use 'instanceOf' in test.