[OTR] Small cosmetic changes.

Affects only build with libotr 4.x.