Improved fallback argument lookup code