Don't pollute namespace as bad as before.  All the types are static now.
2 files changed