Tweak update-forms to drop nil forms
Add a macro discarding pass