A few @trusted-->@safe upgrades

These seem unnecessary. Would be great to fold them in and then merge that to mainline.