Hunk_ and Z_ memory declarations rethinked