Improved 'expression', now supports function calls