Remove awkward classes on *Argument