Slightly fancier transitions in and out of commit mode