Now that the complexity of the default sort clause has been pushed off into adapterland, we can remove the 'FUTURE' note about making a smarter check (because it's already done).  This also refactors the variable name.
Now that the complexity of the default sort clause has been pushed off into adapterland, we can remove the 'FUTURE' note about making a smarter check (because it's already done).  This also refactors the variable name.

balderdashy/waterline,luislobo/waterline