Tweak the ReplaceAll behaviour slightly