Canvas-only performance tweak. see #30