Trying to move statics into storage class rather than the module itself.