Fix the #files and #directories commands. Per command parsing still to be fully implemented.