Revert back to looser binding restrictions. Minor optimisations.