Prep for formal inclusion into Boost trunk.