Fix invalid struct tags and remove unreachable code.

This fixes 2 invalid tag values and removes 1 dead return statement.
I used `go tool vet` to find these. There are some other warnings, but the 2 struct tags were the only real problems I found.