No functional changes, just some tidying.