Prepare for rewrite of abc::map