Just reducing the diff between Nix and trunk.