Split `module' productions into two, one without a following catch, and one with.

The motivation is that some parsing errors still halt the whole pipeline due to
wrong interaction between the catch mechansim and the layout rule requiring
emission of `error' tokens, So we try to keep as much info in the source up
until the occurrence of error.