trampoline for 'if', plus minor cleanups