Small code layout improvements.