I don't think the hard-coded limit will be removed anytime soon (after asking the developers yesterday and looking at the code), but `CF_EXPANDSIZE` could be increased in the future.  I would keep the loop.