Max Version Policy Improvements

Hello, Jared.

I wrote two small enhancements for Max Version Policy, while adapting it to the needs of our projects (see two commits in the request). Hopefully, they can be useful for your upstream version.

Konst