[WIP] performance optimizations

I found this confusing at first (setting all of them to None, that is).  Kind of ugly, but it works.  No real reason not to use it, though.