Bug 971618: Review comments from :arcturus - Will be squashed