* If the internal value is None, do not add the variable * Make sure all aliases for a given variable name are set (if they're not already set in the dictionary) Fixes #14310