Big rewrite of raws, compositional code, and other things.  Read the diffs if you care.