I'm honestly expecting we'll see some form of changes to the system when 3.0 hits - even if it's just "every job gets 3 classes to pull from for crossclassing instead of 2".