Tweaks
#CHANGE: Renamed / Moved Canvas.State class to CanvasState.
#CHANGE: Renamed Canvas.CurrentState property to Canvas.State.