Another cleanup.

committed,
Andrew