Fixed #183. Properly handle callable defaults