Fix annotations to use the right format options.