"[Something will happen] until death parts us" is always how I interpreted it, perhaps to make the pronoun work in my mind, but "death" would be the subject of the subordinate phrase in my interpretation. Ig it comes down to whether you see it as a subordinate clause or a prepositional phrase