fixup! Factor out session extraction code to session_engines