Fix bug in r1459 that munged initial extended arguments