Tweak update-forms to drop nil forms
Add a macro discarding pass
Whitespace
Merge branch 'feature/discard-defmacro' into develop