Refactor some code out of ConvertUsesToScalar into their own methods, no