We had a handful of places throughout our code where we were leaking

file descriptors (or potentially leaking, if we hit exceptions). This

change fixes those up.

Ran unit tests.