7.18: store all {source}s as SIDs rather than server objects to prevent forgotten references and avoid confusion.