Adds support and tests for "metadata" mode, which includes type information.