Remove use of decl_macro by using a different hack.#964

jebrosen wants to merge 3 commits intorwf2:masterrwf2/Rocket:masterfrom

jebrosen:remove_decl_macrojebrosen/Rocket:remove_decl_macroCopy head branch name to clipboard