Start work on special-casing Python 2 in the resolve module