Second tranche of Void-safe fixes.