I think both of those are handled now by me overriding `close_session()` ?