Restore '@' (not has_variable()) to template, fix bug in config.pp