Removing crufty notifyNeedsLayout:
Taking a pass at simpler options
Fixing comment