CLN: move form macros into their own file