Minor: no dangling statement in for
Fix #1816 "FB: Don't unnecessarily keep fr-form-instance:"
Minor: import, dead code, indents, pattern match
Remove unneeded next-trigger