Further cleanup in standardizing on os_base.