Tidy up StructuralStateHelper.