CPS Transformer: Clean up conditional state and blocks

Fixes #886 #887

Review URL: https://github.com/google/traceur-compiler/pull/888

Closes #888, closes #886.