further code cleanup: changed PHOENIX_ macros to BOOST_PHOENIX_ macros, regenerated preprocessed header