Port to wrap zoetropic
More coverage support
More spec improvements
Switch over to proper separation of overlays and core fields
Fix issue of returning augmented self in overlay