Fix or_list grammar; more base rules added.