diff --git a/_adb b/_adb
index 36e58ae..c151196 100644
--- a/_adb
+++ b/_adb
@@ -73,26 +73,23 @@ _adb() {
         (push)
           _arguments \
             '1:local directory:_files -/' \
-            '2:remote directory:_adb_remote_directories' \
+            '2: :_adb_remote_directories' \
           && ret=0
         ;;
         (pull)
           _arguments \
-            '1:remote directory:_adb_remote_directories' \
+            '1: :_adb_remote_directories' \
             '2:local directory:_files -/' \
           && ret=0
         ;;
         (sync)
           _arguments \
             '-l[list but do not copy]' \
-            '1:synchronized directory:_adb_sync_directories' \
+            '1: :_adb_sync_directories' \
           && ret=0
         ;;
-        (shell)
-          _message '[ <command> ]' && ret=0 # TODO Not implemented
-        ;;
-        (emu)
-          _message '<command>' && ret=0 # TODO Not implemented
+        (shell|emu)
+          _arguments '1: :_adb_remote_commands' && ret=0
         ;;
         (logcat)
           _message '[ <filter-spec> ]' && ret=0 # TODO Not implemented
@@ -198,6 +195,12 @@ _adb_remote_directories() {
   _message 'remote directory'
 }
 
+(( $+functions[_adb_remote_commands] )) ||
+_adb_remote_commands() {
+  # TODO Not implemented
+  _message 'remote command'
+}
+
 (( $+functions[_adb_sync_directories] )) ||
 _adb_sync_directories() {
   _alternative \