Merge canvas and canvas events. They can't really be cleanly separated.