session: improve use of session handles