The Diet has passed a revision to the penal code to integrate two categories of confinement--“choeki” and “kinko”--into one called “kokin.” The revision has scrapped the traditional ...