Moving into a safer namespace, I hope.