#350 Cleaning up pyplot messy state that was exposed by singletons work.