hygiene, mash up array pointers and UNUSED flag properly

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>
Merge branch 'code/hygiene' into next

* code/hygiene:
  hygiene, mash up array pointers and UNUSED flag properly