Followup to issue #2355129: Add documentation and cleanup.