I really didn't get getData and getTypeId being so obtuse
Cleanup minor syntax
Fix major issues in ActiveDataPair de-serialization. oops.
Support placeholder-per-block
Release version 2.2.1
Merge branch 'v2.2.1-work'