Start converting to use github.com/ian-kent/gotcha