Update to deal with aforementioned type- vs value- namespace issue.