Update to recurse into type hierarchy.