Minor refactoring / cleanup.
Made grid-snippet self-contained without need for caller's creating grid-cells.