If the FIXME was a future thing, then this is OK with the nits fixed. If the FIXME was a marker for something you intended to address now and just forgot, then we either need another iteration or a follow-up patch depending on the severity of the FIXME in your mind.
As we discussed privately, I went ahead and committed just a minimal patch to resolve the bug in r244511. Most of the rest of the changes in the patch have either already been made to resolve other bugs or are a part of the bigger patch for bug 78703 that's under review. I wanted to resolve the bug without making merging the bigger patch harder than it needs to be. Thanks Martin
