More work on composer support.