Tidy up after recent changes.