Perhaps it would be best to assume that there are always 21,000,000 in circulation, for just this reason.
Sure, and you can even assume that others are assuming that you are assuming that. Bottom line, the numerical boundaries on the possibilities are more undefined the further into the future you go. And with larger numerical boundaries on the possibilities, one's assumptions just aren't as good.