Fix some "unused variable" warnings.

Ah, yes - the change I'v made on my fix-up branch for this is to #define ZONE_ONLY to either empty or ARG_UNUSED, in some of the #if-ery that branches on platform above, and use ZONE_ONLY here.  I should really try to find time to tidy up my fix-ups and get them up for review ;-)