Incoming code cleanup, prepare your bodies for multiple commits.