`match' refactor in goops.scm