Bug #1911: Move is_cdrom function to the right place