Fix unsafe use of MAX macro that could lead to problems with acct_gather plugins.

MAX() will re-evaluate the higher value argument; if this is a function
is may be called twice over, leading to unintended side effects or a
crash.

Bug 3443.