Remove reliance on delayed template parsing.

Change-Id: I11e7fd994123de9b947a51001f36dd8bf3938b44
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>