tidy up variables so that they can be extrapolated from group_vars/all safely