Upstream changes: 1.002 Nov 22 2009 - open up non-ref and multiple arguments since I've not seen any other viable use for the additional syntax
8810d6219e