[Moose-dev] more work on composed shapes