Move the mutability into the macro, cleaning up call sites