Move field limiting logic out of to_dict.
Remove TODOs.