7825: clean up Canvas cont...