Got rid of this magic string checking craziness.