One last thing (sorry I didn't catch that yesterday): remove extra empty line here and run `go fmt` on this file, the formatting looks funny.