Abolish a silly layer of macros.