Two more lines of coverage; more cleanup for macros