With the nice refactoring you've done, `Hammer` should no longer be necessary here.