Use and if statement, drop unnecessary guard.
Merge pull request #1458 from braddunbar/max-min-style

Use and if statement, drop unnecessary guard.