Remove extraneous typenames from r215957