Refactoring lambda analysis, renaming 'restricted' to 'constrained'