fix more require-before-expand issues