some tweaks to argnames.