more ec2.nix cleanups