Conditionally use some 3.6 functions that never quite made it.