This should give slightly better performance due to not having to look for the terminator byte twice. Not benchmarked. No-op. Change-Id: I458a06b492393fcf5b186a61b69acabdf63a216e