Thanks, although unfortunately I don't see this PR ever being pulled in anyway so I'm not going to spend time updating it.  Sad really.