Clean up some incomplete additions.

Also fixed a bug or two.