Ticket #1990: code cleanup before 4.7.0.2 release.