Follow on changes for bug 424290 - lambda shape analysis
Fix for bug 450442