Improve escape analysis for more argument combinations