Update to avoid reserved-for-any-use identifiers.