Was done as part of the refactoring from previous comments.