Comment out code to help migrations.

I could keep it. Maybe clean it up. We might need it again.
I kept some restructurings that were necessary to implement this
in the first place.
Drive-by: I'm pretty sure the null marker doesn't need its own class...