assorted minor changes prior to an upcoming major change

Trying to make way for boosting requires a rework of the scoring infrastructure.