Add pk ordering where useful.