Remove dependency on opts-go.
Merge branch 'zk-cleanup'