Namespace stuff I didn't commit for some reason.