Splitting reinitializable_static into to separate entities