I thought maybe this might make things easier. :)

I hope you like the changes and accept my patches.