Minor cleanup for gotype.