Yo - we'll probably combine the two PRs.

Cheers,
Thomas