Redo the pair classes.

I love lombok.