CommitLocker.Enter reduced span of finally clause.
Trimming moved out of finally block.

Trimming is not critical, there is no need for it to delay a thread
abort, if one is requested. (Of course, nobody should use thread
aborts :)