Oh, crap. After all that work changing everything to barriers, I could have just changed dashes to underscores.
