RLS - update grammar to allow roles and commands to be optional.