Your suggested argument is too broadly-worded for their intentions. It would allow Obama or Clinton to run again. Last time they tried to push this shit, it was something along the lines of “any president who’s been elected to two non-consecutive terms would be eligible for a third.” That wording uniquely qualifies Trump while keeping two-term Democrats disqualified.