Mark unused vars as safe where appropriate