Reorganized nix expressions.