New CharacterMerit / Merit approach, which I think is going to work out
cleaner and less confusingly.  Less annotation magic bullshit and manual
rehydration.