Fixing and shortening block context setup.
Merge pull request #329 from herby/fillblock

Fixing and shortening block context setup.