Cleaner internal data version handling.
Also, do not update internal data version if it doesn't match current version.