I haven't had time to look at it in depth.
However, from what I remember of my quick look I think I preferred another way to implement what you did.