How about not using an ordered dict here? Just use a regular tuple or a list?