Dealing with the extra location information in generators now when loading values into a System.