Uglier but better handling of more/less args for proxies