Sorry I must have been reading something else. I think those === are needed only when posting for disciplines with own articles (diving for ex.) But for cycling we can also remove them since they are all in one article. Also for team sport rosters there will be templates for each of them.