Fix conditional validation

Conditional validation was broken — went in and fixed a couple minor errors. I don't have time today to write tests but this is passing tests on a project that uses conditional validations (where the test was failing at first). Putting notes in the diff.