Fix decision issues. Simplify sugar.

get some tests to compile

slow progress

get decision unit tests to pass

get more decision unit tests to pass

all but complex sugar decisions

rename to doIf

all tests pass

cleanup