More work on the composition move.

Tests and docstrings.