Add temporary directory cleanup block missing from the previous check-in.