Small fix to get multicomponent state to behave itself, particularly with adaptivity.