Moved validator.
Annotation inheritance (#2) largely complete, needs more tests.