Fix even more ldetect issues.