Convert to match simplified annotations.