Drop the source field from the source alternatives as we matching on the source URL now

Also some small stuff like factoring out all the post-processing into a common function.