Optimisations for true-size support