\event and \session tweaks