case 1495 - Better hadnling of return values and properties.