fixed parsing for types & expression with brackets