Improve DI DSLType composition. Add assertNonGeneric.