Some small optimisations, generalise the type of unfold