File coding style improvements and fixes here.
*** This bug has been marked as a duplicate of bug 7119 ***