Don't pollute validators

Fixes #174.