Flip fixity of TH sub.

  And do some general cleanup.