Refactored function parameters, in preparation for refactoring property values.