Fixed Bug 424290 - [1.8] Evaluate alternate options for lambda shape
analysis.