Handle block packages.

[vickenty]

This fixes the problem where subroutines following block package were not parsed, and their tokens were erroneously attached to the package node.

[wchristian]

Thanks, this has been cherry-picked, changed a little and released. :)