Further optimisations.