Updated more BOOST_AFIO macros