Corrected remaining 23 warning raised by Xlint.