Pass before and after snippets to template diff

The before template should be passed explicitly, rather than relying on
some state stored in the object.

Change-Id: I5b0af8da2e1df3f6ad3291554cbbc243b51e3fe5
Merge "Pass before and after snippets to template diff"