Add SAS trail IDs in

Should fix #467. Not tested, but it compiles - I'm hoping you'll agree that it's a reasonably obvious and safe fix and doesn't need targeted testing.