Update a couple more core templates.

gh-232