True, it's a holdover from the old checking-when-exit discussion. Will remove.