Minor reorganization and added ido-complete-space-or-hyphen.