upgrade shervin (simplified guard/handler rules)
adapt flon-listener to simplified shervin