Simplify the initial byte_count calculation to get rid of the lame workaround added...