Minor edits to various classes.

Mostly some solidifying work on C4ShapeLayer and other C4Layer classes.