More constness/namespace policing