Remove some more duplication.