Remove more of initial rewrite.

See #109.