Fix validator label handling

I have no idea why it was treating labels as code -- they never seem to
be -- or how it was working at all before.