Per Paul's review comments: revert emacs auto-indent, remove meaningless order by clause