More work on boost porting.