Commited changes suggested to fix the recursion issue:
The fix was provided by https://code.google.com/u/108700190352774638376/
	modified:   condition-builder.js