(If only I could point gofmt at everything.)
Remove goconvey dependency and improve clarity of intention.