Higman: some refactoring.