Expand templates

From Vampire V5

Expand templates