Refining grammar - mostly focused on whitespace and comment handling.