Actually support named arguments

Change-Id: I658211b892e35a51bd0cf512bf6758f16c84726a