More efficient delegates without return types.
Fix for variable redefinition regression
Substate