Fix parsing of raw types