fix nissing #if
fix module expansion inside arguments.