More schema code refactoring.