Fix for #2175 - Spacebars block comment cause unexpected errors

This fixes an edge case where a comment is followed immediately
by an {{else}} token.