More refactoring to make variable display config factory more robust.