You're both right, but these were mostly mechanical changes. I didn't want to obscure what was happening too much, especially since this commit wasn't about removing the eyesore that is `BOOST_FOREACH`.