Consistent Cell-Cell ordering, and seperate Cell-scalar semantics.

A candidate fix for the follow-up problem reported in #121.