More work on optionally removing unused features at compile-time. (CVS 2049)

FossilOrigin-Name: a82980fd70285820c64b42393ef85a9e21addc5d