Clean up direct use of some of the dicts mapping cellname to number of
something.

Using Cell methods instead which can be overridden by cell subclasses.