Another (last?!) round of code-review issues:
- Fix javadoc field references
- Drop unnecessary declaration specifiers from interface
- Allow more permissive predicates; use 'instanceOf' in test