Add a bunch of missing "template" keywords to disambiguate dependent template names...