Making several inner classes and fields static.
5 files changed