Fixed all remaning score manager migration-related FIXME items.
Merged master.
Merged master.