Make raptor-templates an optional dependency (round 2)