Keep eggs order

This makes sure the eggs order isn't changed by using an OrderedDict
instead of a normal dict in some intermediate representation.