samples and a reference. Also fix the other nits mentioned in the issue.

This also partially addresses issue #14006.