Almost done with adding 'finally' blocks: testing and fixing.