Address comments from @dirk-thomas on #712