Can't the change the 21M?

Yes, they could change that, too.

However I expect that adding more decimal places will actually happen, but adding extra bitcoins won't.