Issue #1712258 by alexpott, dagmar, Shuairan, disasm, slv_: Simplify image toolkit form logic, removing unneeded checks.