Simplify external references even more

Also improve partsta