cleanups after merge of PR #739