Refactor on the definers.