Standardize on source+id, rather than where+node