synopsis: Flag assignment parsing refactorings
prs: #6854 #6858
issues: #6853