Honestly, I'm kind of a PL3 guy. The code's cleaner (IMO) and easier to follow and splice in changes, but for this one I did plan on compiling it special and not commiting it to my github until I redid it.
Unfortunately, it's going to take a lot more work than I have the energy for tonight. Hopefully someone will clean it up in teh next 18 hours or I will do it then. :-(