Correct order of worklog entry expression clauses to conform to the new grammar