Brought into closer alignment of my old grunt-init.