Be more careful about expanding conditions in the unicorn parser