When we're building up named properties into a hashset anyway, put
all properties into a single hashset even if they were already in
another hashset.  It doesn't seem to be much faster or slower.
(Also another minor bugfix.)