Some minor code layout tweaks for consitency accross the code base.