Work around partial type caching bug

... by placing commit at a different position.