Lots of updates to CAShapeLayer support