Cosmetics

Verified: these patches do not change md5sums of compiled bins.