Improved escaping, allow ^^ syntax for datatypes