Useless optimisations removed.