Fix the query planner so that it once again knows that queries without a
FROM clause will never return more than one row and hence do not require
sorting.
Fix a typo in a requirements mark comment in a test script.  No changes to
code.
Remove the WHERE_LIKELIHOOD bit, as it does not seem to effect any result.