Major rewrite of Survey generation for simplicity. Also includes support for CONDITION_GATE.