Fix Introspector schema handling.

Partially fixes #486.