Improve whitespace handling with nested exprs