Faith refactoring.