#259 Revert to Closeable until we consider wider implications.