I don't like changing things that are not directly part of the patch, but I can file a separate bug for this!