Various streamlining changes.