Macro refactoring. Variations on VERIFY_TIMES. -Jon