Fixed a bit of abstraction leaking, still more to go