More conversion warnings scrubbed.