Fixed compile errors and ran go test. Things seem to be happy now.