Move CompositionStates out.  Change signature of parseODS.
Move CompositionStates out.  Change signature of parseODS.

amichaelt/BDSup2SubPlusPlus,darealshinji/BDSup2SubPlusPlus,darealshinji/BDSup2SubPlusPlus,amichaelt/BDSup2SubPlusPlus