Namespace formatting and comments to make things more consistent and
clearer.