Minor improvements to BootstrapFunctionBinder