Rebase to master, change JSONBase to TypeMeta.