More cleanup of staticmethod from_dicts.