Clean up/normalize auto-injection of templates
Simplify count implementation (breaks it temporarily)
Fixed again-- and now count=0 works as well.