Correct handling of finally blocks and field types.