x64-upstream: eliminate some warnings in base/