Merge all of Carl's currently-proposed feature branches:

Including:

	trim-more-no-side-effects
	trim-auto-by-default
	cworth-bug-fixes