I haven't got an answer to the second question because I haven't thought about it very carefully and I haven't looked at the material recently. Perhaps Mr. Benson can help.
Relative to the first question, I think you are right: huis clos would be a better way of phrasing it.