remove cases already handled by _get_typed_value, add test