Just a simple refactoring. There was only one caller, and the intermediate data type was not helping.