Starting to get rid of defs for Audio.