I'd like to cancel/recall this patch. It's not critical since it affects behavior on error, and it will be affected by parsing and chaining changes, so it's better to revisit this later. I wanted to keep the tests but don't know how to properly add them as TODOs.