Move MAX() and MIN() macros to util.h.