Cleanup formatting in bug 2741 patch