Minor bugfixes around arg handling.