swift234

Fix parameter indexing when a non-removed error param is followed by blocks.

Tested as part of the next commit.

Swift SVN r28977