Remove Boost.Phoenix dependency