Don't send unset protobuf fields. Also some small hygiene fixes.