More tentacle code improvements.
Add two compile checks on array sizes.