Minor code cleanup
Better error message about undorderable types