Refactor cyclic/bisimilar based on new definitions.