Changing something so fundamental seems like it should be a rewrite.