Repair some stack depth housekeeping.