We should be able to assume @ Nonnullable for matchState now.