V2: Use a single definition of MIN and MAX in sources