Merge pull request #21 from dylex/master

Tighten up effect types on modifyScope and modifyThis