Support for expressions calling @()
Refactoring