[patch] Use insert's return value instead of find + insert

[Cary Coutant]

> The attached patch just avoids a find+insert pair. It is simpler and a
> bit faster.

This is OK, with a ChangeLog entry. Thanks!

-cary