Splitted up the ModifierMask class into class and member masks.