I think you still missed a few, including line 20 and 54 of the diff, the patterns are much easier to read when these ones are also at the top, I think there is probably a couple of others as well.