Update for use with boost 1.55.