Fixes #254

I'm not sure if what I do in the `BlockStatement` callback is really the most elegant solution to this problem, but it works. If anyone has a better idea of how to approach this, please let me know.