Fix bugs in scoping with keyword arguments.