Really fix UNKNOWN-CTE handling