Apply suggestions from code review
Apply suggestions from code review

Style fixes from @edolstra

Co-authored-by: Eelco Dolstra <a62bb81833b901aa80639248569d9a70b8fe36aa@gmail.com>
NixOS/nix,NixOS/nix,NixOS/nix,NixOS/nix,NixOS/nix