More Composer-related changes.