Consolidating type class modules