Finished Canvas2D refactoring.