Finished pre-1.0 rewrite.