Fixup of unused function warnings for gcc490.