Revert "More work on ID spell."

This reverts commit 31e3dbd9874f06f8db4a4a2501fe93610b155afe.