Isolate aviary contrib from 7.8/7.9 string formatting signatures