Updated expression signatures for WITHIN/BEYOND operators to something sensible.