Revert "Fixes more autoarg errors"

This reverts commit 4cb772143b9dcdb5caf3d0381959bd13c7ca6fff.
Actually fixes more autoarg errors