Move common dictionaries to config.py. Remove completed TODO.