I just found a couple more test cases that should be included, so you can either commit this now and I'll send a follow-up patch with the new cases or you can wait and I'll send a v2. -Alex