some more bindonce optimisations