MADS: Cleanup of verb/preposition flags handling