Remove redundant calls to addNames in toSrcType
cosmetic: improve indentation