Rollback composition strategy refactor.

Closes #111.
Closes #110.