Use :each instead of :all here, too
Merge the rest of #1765

This merge and commit f2838ee is for both. I was a little quick on the
draw for the last merge, didn't catch the latest commit.