Move cb:next-dwim to top-level