Switching away from validator decorators #64