Some more reworkings.