Refactoring not-so-common vars out of vars.yml.