Fix Trac #2130: improve derived Ord for primmitive types