Followup r96978, clean up code duplication by factoring out the code building load...