Use the atlas.BuildVars type. The -var/-var-file precedence issue is a bug documented in #2682. Not introduced in this patch