1.8 compatibility changes

For comparison with #152 and #147
yeah, pretty much.  I guess I was just being careful about loading the right file and maybe just relying on it already having been loaded by something else. I'll try without the guards.