[Reviewer: Andy] Don't reuse the boost map

Andy, can you review this change to no longer reuse the boost variables map