Opaque canvas could not hurt

Does not seem to improve performance though.
Also, lots of trailing whitespace noise in commit.