--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-03  Jaroslav Hajek  <highegg@gmail.com>
+
+	* lo-mappers.cc (xmin (float, float), xmax (float, float)): Simplify.
+
 2009-03-02  Jaroslav Hajek  <highegg@gmail.com>
 
 	* mx-inlines.cc: Add missing #include.

--- a/liboctave/lo-mappers.cc
+++ b/liboctave/lo-mappers.cc
@@ -561,39 +561,13 @@
 float
 xmin (float x, float y)
 {
-  if (x < y)
-    return x;
-
-  if (y <= x)
-    return y;
-
-  if (xisnan (x) && ! xisnan (y))
-    return y;
-  else if (xisnan (y) && ! xisnan (x))
-    return x;
-  else if (octave_is_NA (x) || octave_is_NA (y))
-    return octave_Float_NA;
-  else
-    return octave_Float_NaN;
+  return  xisnan (y) ? x : (x <= y ? x : y);
 }
 
 float
 xmax (float x, float y)
 {
-  if (x > y)
-    return x;
-
-  if (y >= x)
-    return y;
-
-  if (xisnan (x) && ! xisnan (y))
-    return y;
-  else if (xisnan (y) && ! xisnan (x))
-    return x;
-  else if (octave_is_NA (x) || octave_is_NA (y))
-    return octave_Float_NA;
-  else
-    return octave_Float_NaN;
+  return  xisnan (y) ? x : (x >= y ? x : y);
 }
 
 // complex -> complex mappers.