Making several inner classes static.
3 files changed