Comment 3 for bug 916234

Here is a patch with some code style and formatting changes I made while researching this bug. This patch is against the previous submitted patch, but should apply straight onto head without modification.