More template rejiggering per https://docs.puppetlabs.com/guides/templating.html#testing-for-undefined-variables