Once and for all fix pesky array overreads.