Merge it for now but I'll keep these in mind for later. I'm going through all the libanki classes anyway and fixing up things like this, but I haven't looked at Sound.java yet.