In prep for a cleanup.

committed to mainline,
Andrew