re-organizing use of macros with RVA_MAP