Cosmetics.
Finally descriptive names.
Wrapper is actually Modifier.
Disambiguate execution state control.