Excellent! This is pretty much what I was going to do after looking at David's patch. I didn't get time yesterday, but it appears you did :D