minor tweaks to simplify the diff between us and mainline ExCanvas