Re: simplifying user hooks (non-backward-compatible)