control: update to be Go 1.x compatible.