Less messing with composer.lock, but there's still some unrelated changes I can't get rid of.