Coding style fixes that are enforced by upstream recipe

Hm, you're right. And we've been discussing about it already...