I spent all day merging the International Drive back into a single way and tagging all the lanes.  I completed it with a second changeset.

Majority of discord said the foldable bollards aren't enough reason to split the ways as emergency vehicles can just drive over them.  I just handled them with turn restrictions.