Small changes to zone object
First crack at index zone -> zone
Put conversion in impl objects
More work on zone
Continue with zone work, end in sight
Things are kind of working, clean-up needed
Finish up de-indexing zone

This should finish up the conversion between the indexed and
non-indexed zone objects. There may still be some cruft that
will need to be cleaned out at some point.