WIP very tricky

Experimentally remove some logic changes to functions like get_score,
trying to avoid weird downstream conflicts.