More migrations; require ordereddict if Python below 2.7