Split up defines incompatible with CPS conversion

This fixes the adder example