More refactoring. Removed ObservationService's dependency on the
GenotypePhenotypeService.