Fix erroneous check for colons in track names; clean up