Remove a convoluted way of calling close by moving the call to the only caller.

As a bonus we can actually check the return value.