refine error message and simplify grammar
preparation for parsing branch data into log struct