0.0.4: move static locals in