It seems to work, actually -- expect a PR against this shortly, once I've read through the rest.