Macro-ify BRANCH-IF. Undo EXECUTE change that broke tests.
Macro-ify SET-FLAGS-IF.