Specialize some types.
Misc minor changes.