Fix some code layout so that we don't have so much overflow.