Schema consolidation, and various code inspection fixes.