Revert "Simplify with-spies macro"

This reverts commit 7c649af01f1551fa70608f17642b0806044f0d69.