Tidy up; no functional change.