Rename and de-templetize sort()