Making the music classes more robust against machine differences.