Got rid of some nasty concatenation.