CPS Transformer: Clean up conditional state and blocks

Fixes #886 #887