Unfortunately, I've changed (and broken) a bunch of other stuff with the core as well, so it'll have to wait until I release 3.0.
