Two major changes:
- Move case statements out of the TARGET macro.
- Move PREDICT macro invocations after the case label.