GUI-920: Simplify filtering instance choices by state in form choices manager.  Minor PEP8 cleanup