Fix TransactionScope-related bug

Francisco, this is a quick fix for a bad hang bug I introduced in the first TransactionScope work. It's unrelated to the bigger task (which will redo lots of the previous work anyway) and should definitely be merged for this release.

Depends on the normalization PR.