Improve generic composer coverage.