Some cleanup to better handle chains of traits.