Make mutable ops return self for easy chaining.
Fix accidental removal of typedefs/includes/externs

One of the problems with merging things from different repos...