Adjust parsed type to match declared type.
Accept more tokens in the factory.
Revamp BoxedTopType Json-parsing.