This one should be able to deal with the USAGE macros a little