Remove some statics.
Remove more static non-ptrs.
Fixup.
Just use straight arrays.
Ok, that one needs to be what it is, but cleaned up the rest.