Birthright citizenship should only apply if both parents are citizens, to be honest.

This of course complicates relationships that start between people of two differing countries, however we already seem to grant expediency to those circumstances to begin with.

Further additions to such a provision could include a retroactive application whereby the child becomes a citizen if the spouse does.

It's not the easiest thing to resolve, and cutting it entirely creates a lot of visible problems that will detract from fixing it, but it's clear that something needs to change.

I would also add that federal law should be changed such that you have to be a citizen for, say, ten years before granted the ability to vote or run for any legal office.