Since we're moving to a new syntax anyway, I wonder if we could go to *only* supporting strings? Maybe not because the `comment` fields might not have been set correctly previously?