Revert "Lots of very small additions."

This reverts commit 85d317c180e995b7f8f308704c58bcf1b1f2645e.