More optimisations.