Squash before OrderBy (Fixes #264)