Fix up the last of the '@TODO: Fix up this function.' in Query class.  Restore ability to put the 'ignorecase' parameter in any order.