Refactoring a stupid named extension of mine