Composer update. Small cleanup.