Eliminate warnings about %TYPE.

Using %TYPE showed this warning when tests fail for unrelated reasons: NOTICE: type reference snapshot.id%TYPE converted to sha1_git

---

Migrated from D1879 (view on Phabricator)