Address comments left by @dragos and @dotta.