Some more work on the compose script.