Minor changes due to the new LIKE support.