Finish fixing generic variants of cover templates. Closes #588.