collect-on-eval defaults to true, commit missing collect-form var