Change strategy. Reimplement with-user and user macros