Hmmm. Is there any way we can move this into `compat`? I'd rather centralize all of the compatibility shims into one place if it's possible, but I don't think you can import a `long` redefinition in 2.7...