Middle of a major rewrite.