* Also use canonical notation for pointer variables and
  consistently use uuid[CDI_UUID_SIZE] for UUID passing.
* Whitespace before the # of preprocessor defines is not portable.