Clean up code to use wtu.checkCanvas*()

Please take a look.