coverity thinks theres an overrun here, I think its wrong, but its
needlessly complicated code, simplify

Change-Id: I9db4886b4e60d49c25de514081953cb380d4146f