Clean up canal rendering.

This does not change rendering.
Merge pull request #580 from math1985/canals

Clean up canal rendering