Made some tweaks to make checkpatch happier.