Fix a bug in romanization, and clean up some unused branches of Japanese code