...this would both improve our general design and circumvent the problems with Clang and static variables