Restore case-on-bool in codegen