Pinging this thread at Andy's request. :-)

Here's the two patches: