Due to newer nixpkgs, there were a number of things that could be cleaned up in the process. (cherry picked from commit 743795b2b090a5cdfe8bd90120add8db7770086a)
