...changing them is deemed incompatible, so best avoid such cosmetic changes.

Change-Id: Id57d38721a4f3b83933fa13c509c20eacb95f903