Whoops; I thought I cleared out the old changes from my cache. My bad!

Ya, that looks werd as all heck. Unfortunately, my vacation is over, so I'm no longer in that area.

I made it into something I think is reasonable Thoughts? changeset/72750565