Use std::min()/std::max() where it improves readability.

Use std::min()/std::max() where it improves readability. #217