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