Replace isnan() with better comparisons (isgreater(), etc.)

Replace isnan() with better comparisons (isgreater(), etc.) #3607