Added correct handling of callable objects as default values