Some unused vars weeded out. Others have been arrayified.
Var Count: 1903 > 1889 [out of 2048]