Multi-version friendliness.

Changes which are necessary (but not sufficient) to build on 2.11.