Minor changes to how arguments are handled.