Make sure the block gets passed around properly.  I really should have added tests for this first, but I have to get my project working.