Merge "Standardise safety comments for unsafe blocks, and add some more." into main