WIP. Removed BOOST:PP dependency.