less ambiguous enum constants
Clean-up relcache stuff