JAL-2416 tidy up after switch from ' ' to '-' in score matrices