More work on the Go generator. Parking it for now.