Mark OLESEN authored Apr 06, 2021 and Andrew Heather committed Apr 19, 2021

- affords some code reduction.

STYLE: use HashSet insert() without found() check in more places