Bring back MIN and MAX in a few places.