Remove duplication.
Small reorganization.