Removed the static global state from Gunsmith