Eliminate more of the "return from finally" asshattery