Bug 1087630 - Address github comments.