additional macro redefs