Issue #1074: Minor doc and API changes.
Issue #1074: Some tests, but not for the --set option, alas.