More optimisations will inevitably occur, but these need to go for now.