Switch to Ido!
Some minor cleanup.