Started the removal of the dependance on BOOST.PP