Small refactor of the grammar for shell requests