Cosmetic touchups.

Backporting these cosmetic touchups to custom extension code.