r5569: fix more breakage on gcc 2.96