Changes to work with Tim's restructuring of go communication.