Bug 837537: address review comments