I think this is probably the right approach (and mirrors that for AR#save!)