cover: When it makes sense, return at the end of the method.

When it makes sense, return at the end of the method; this also removes the
zero byte arrays.