Move ordering of basic stuff to repository.
Remove override of default sort.