fix #6599
better fix for #6566. also increase inlining

this inlining threshold seems to translates to approximately 8
expressions of low complexity, and about the same number of llvm instructions
incorporate Jeff's comments for inlining patch
Merge branch 'jn/6599'