Correct some circular error I made when mapping BlockSyntax.