o Code simplification and refactoring:
    - Remove redundant declarations of the MIN macro. Closes ticket 18889.