Improved Dynamic Type support.