Revert to pre-buffer approach for DWITHIN/BEYOND operators for now.