Moving translation logic to the validator (fixes for 2.2, see #52)