James D. Callahan III:
	- Revert "Revert "Stylistic changes.""
	This reverts commit 524b4212498e4d79d4a4e84fa9afa3835579fe74.
	- Revert "Stylistic changes."
	This reverts commit 87946fc9fb9c3fd7d0d86b763dcee4d12d45b1c4.
	- Stylistic changes.
	- Update ToC version.
	- Remove some commented-out code.
