Bring in line with recent changes to GTLib.

This relates to issue #87.