fix more multiple declarations in one line issues wrt arrays