A bit of cleanup of exit hooks and marking exercises.