Move more lists and dictionaries to common.py.