You know, I can just imagine an Olympic committee meeting along the lines of "Right, we've built this expensive velodrome for the cyling race, but we've got two weeks events to fill, so let's have a brainstorm to see how many ridiculous cycling events we can come up with to fill the schedule."
Madison, Kierin, Points race, Sprint, Pursuit, team variants etc etc All involve getting on a bike and trying to go faster than your opponent. That's one event. Sorry Chris, I'm taking some of your medals back.
Likewise the swimming - one race, whoever is fastest wins, use whatever stroke you want.
And any event that needs music isn't a sport, it's a dance.
I might make an exception for Synchronised Swimming though, if they amend the rules slightly : every 30 seconds, a shark gets released into the pool, but bonus points can be achieved for maintaining those fixed smiles whilst being dragged under.