Associate join labels only with QueryPlans instead of also with Joins

This is a continuation of #20 since Tom is out.  It also replaces #21 in favor of building on Tom's solution to fix the old issues.