Fix up some exits that call functions instead of just doing move to a
location.