More fixes of issues found with parsing other files, mostly with blocks and block-type parameters