Bug 927852 - Address Etienne's review comments.