Merge "Use expression functions when appropriate" into main