On the set-theory bit ("Zermelo's axioms ... evolved into the now-canonical ZFC set theory") that begs the question.  The fact it says so in Wikipedia does not guarantee its truth!  Let me see if I can dig up the relevant sources.  Also worth adding that the controversy is an old one: the Zermeloists successfully argued that the theory was 'natural'.  But there was no evolution.  There was considerable resistance to the theory at the beginning, universally accepted thought it is now.