Even more fixes for greedy find/replace.
version bump.