I'll split this into a separate commit.  It has already been applied to the library itself (SHA 6d17d5283e0868cfc3d74d1e9d37b572e1739b6e).