May be cleaner to just do `return dict(...)`?