A little cleanup in how we handle the -namespace option