[#1027] change function statements to expressions