Moving the MultiState concept to its own class.
Now that we have a legit equals() implementation for MultiState, we can get rid of this stupid helper method.
Doing a cheap/easy refactor of a couple last inner classes into their own classes (mostly just for mental de-clutter)