Split up prepareValueByType()