un-hardcodize ur-macro