Fix a syntax error in config example
Don't call InnerFun and remove/3 if the binding was not there.
Merge bug 26014
stable to default