Tidy up a bit. No functional change.