Last minute clean up for consistency with docs.