[PATCH 06/15 6.6.y] minmax: don't use max() in situations that want a C constant expression