
        Move from using return_address to a macro-mediated rooting solution.

71333b8