More improvements to safe_static_initialization