Remove unnecessary inclusion of boost tuple + small cleanup.