[PATCH v3 11/11 6.1.y] minmax.h: remove some #defines that are only expanded once