Bug 907585 [3/3]: some small refinements.