Factorize the fact of removing self args

Add the logic of handling self args to an existing method.

Tests: