Final commit.

This is the final commit. If another commit goes in later, it'll be for bug
fixes only.