More cleanup; no normative changes.