Replace descriptions with ordered dicts.
Cleanup code.
Correct merge.