Code cleanup (squash).