Canonical combining classes and code cleanup.