Tidy up for 2.3 and upwards.