Address comments by @asutherland.