Start converting to use github.com/ian-kent/gotcha
Fix eventstream
Fix gotcha support (and some other bugs)