Shove in some more getargs support