Debug-session-leak-related fixes

See also #19 (closed) (the reverting commit message slightly modifies and supersedes the information currently in the issue).

See the commit messages for details.