More cleanup of 1574 warnings.