Make sure autoruns for {{#with}} get cleaned up.

Related to #2145, #2023, #2031.