Restructure: Less defines which correspond to array sizes.

[pjf]

Right now we have lots of #defines which define sizes of things.
It would be great if we could use sizeof() or similar to derive sizes
of fixed arrays.