Adding a '-disabled' shim that is hardcoded to disabled.
This makes it easier to quickly switch with a disabled WTF.
Fixing the zone painter to start drawing from the proper type.
Previously it was possible (though rare) for the wrong event to be drawn
first.
Merge pull request #288 from google/rsturgell

Add some necessary grouping to code transforms.
Merge pull request #290 from google/fixstart

Fixing the zone painter to start drawing from the proper type.