Fix premature optimisations