Simplify namespace link creation a bit more