v. 0.8.1, generalise NFE to Scoped calls, various optimisations