Minor tweaks to support arguments which are ignored