Try to be as explicit as possible on the million different uses of 'validator'.

Closes #175.