More minor optimisations.