Altering the way that callbacks are generated, to hopefully pass tests on 1.9.3