[PATCH v2 12/12 6.6.y] minmax.h: remove some #defines that are only expanded once