Do we need to do this around word boundaries?