Support self.extract_value_from_default
It also addresses #394