Using wrappers for commands and events.
cleanup after merge.