Improved handling of dollarised function/property names