Couple more (optionally) unused contexts.
GCC_DIAG_IGNORE/RESTORE whine in non-gcc if at file level.