No need to add grouping for simple expressions anymore