Add some power to the canvas assertions. Also, the canvas assertions weren't actually...