Instead of a global switch, unwrapping occurs now automatically provided config is non ambiguous.