Added String#phony_normalized method
Merge fixes.