Finish first-pass of escape functions