Minor tweaks to match the new exit behavior.