[PATCH v3 02/11 6.1.y] minmax: don't use max() in situations that want a C constant expression