Fix formatting of optional fields with non-string annotations

[mthuurne]

There were two inconsistencies in the formatting implementation:

• _collect_type() was only called for annotations in string form, but following code relied on the streamlining applied there
• _format_value_for_type() could not handle the case where a dataclass was replaced by a specialized Binder