Fix channel leak and simplify code.

Fixes a channel leak seen in a consumer. Simplify the HasEmptyField
function.