Fixed parser so that square brackets count as delimiters