Improves autoarg management