Reduce diff between Nix and trunk.