libstd: Fix merge fallout.