Build out the types structure, fix matching on accept by ignoring the root