Rewrite to export all fields.

... Arbitrary division by "type" was arbitrary.
Make sure our component code gets called.