Improvments to expression parser with multiple brackets