Correctly mark nested INNER joins as such

Correctly mark nested INNER joins as such

We've been adopting containing the JOINs flavor, and then
attempting to use IS NOT NULL to restrict NULL-ness
in the WHERE clause.  This is almost right, but not quite,
and was done in an attempt to match behavior with the
expectations of users that are not SQL experts.  However,
right is better than "looks right most of the time", so
we use the proper join type now.

Signed-off-by: Mike Rylander <mrylander@gmail.com>