clean up grammar for conditions, fixing #597