Fix for over-aggressive substitutions

Previoulsy these would clear a single-word label. Now they'll at least look for whitespace and an adjacent word boundary.