Still update templates on cleanup; improve afc template regexes (wwhhhyyyy...)