Pass through block in first_or_create(!):

Instead of calling after.

[ fix #3034 ]