(Bug3081) Bringing into line with coding standards.