Fix the parser to detect blocks with unless and case