Update cell type handling, etc.

Corrected some instances of cell type handling that were still based on
SpaceMerc's cell type values, changed CAPTIVE into an item type, and a
made a few other minor changes to the code.