fixes a regression introduced by #1910

Changing the context of a each block when a keyword is specified, defeats the purpose of a keyword.

Some regression tests where added, to prevent this in the future.