Tighten up code coverage as per #128.