Another small bit of refactoring