#371 Moved composition arcs away from inheritance arcs. Looks good.