Namespace improvements.