Made some more progress towards supporting the modify_numeric and modify_string callbacks