Fix matching spec files with extra args, for when running a specific line
Rename local variables