I am doing this after the main transformation to ease commit by commit understanding of the change. rdar://128216574