Remove hack on values array length, now manually unroll loop