Bug fix: Building template tokens breaks on inline OR condition (Issue #573)