- Performance improvement: changed a fair amount of "left joins" to "inner
  joins".  Patch by Gerhard.