Add external link contexts; reorder stuff for consistency.